Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 Fix APIVersion in OwnerReferences to ClusterResourceSets #7022

Merged
merged 1 commit into from
Aug 5, 2022
Merged

🐛 Fix APIVersion in OwnerReferences to ClusterResourceSets #7022

merged 1 commit into from
Aug 5, 2022

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Aug 5, 2022 •
edited
Loading

What this PR does / why we need it:

Issue got introduced in #6989 .

The introduced change creates an OwnerReference at the ClusterResourceSetBinding which looks like as follows:

    - apiVersion: addons.cluster.x-k8s.io/v1beta1, Kind=ClusterResourceSet
      kind: ClusterResourceSet
      name: self-hosted-64pplg-crs-0
      uid: 630b7f3c-babd-409e-837a-d6a849729b9d

This fix adjusts it to be:

    - apiVersion: addons.cluster.x-k8s.io/v1beta1
      kind: ClusterResourceSet
      name: self-hosted-64pplg-crs-0
      uid: 630b7f3c-babd-409e-837a-d6a849729b9d

Without the fix, clusterctl move is broken because it tries to get an ClusterResourceSet of APIVersion addons.cluster.x-k8s.io/v1beta1, Kind=ClusterResourceSet which does not exist on the client and thus results in the following error:

error reading "addons.cluster.x-k8s.io/v1beta1, Kind=ClusterResourceSet, Kind=ClusterResourceSet" /: no matches for kind "ClusterResourceSet" in version "addons.cluster.x-k8s.io/v1beta1, Kind=ClusterResourceSet"

This should cleanup the testgrid: https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api#capi-e2e-main

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Aug 5, 2022
@k8s-ci-robot
Copy link
Contributor

@chrischdi: This issue is currently awaiting triage.

If CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 5, 2022
@killianmuldoon
Copy link
Contributor

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: once the present PR merges, I will cherry-pick it on top of release-1.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

killianmuldoon
killianmuldoon approved these changes Aug 5, 2022
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2022
fabriziopandini
fabriziopandini reviewed Aug 5, 2022
View reviewed changes
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 5, 2022
@fabriziopandini
Copy link
Member

/cherry-pick release-1.2

@k8s-infra-cherrypick-robot
Copy link

@fabriziopandini: once the present PR merges, I will cherry-pick it on top of release-1.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot merged commit 5dcb8e0 into kubernetes-sigs:main Aug 5, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Aug 5, 2022
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Aug 5, 2022
Merged
@k8s-infra-cherrypick-robot
Copy link

@killianmuldoon: new pull request created: #7024

In response to this:

/cherry-pick release-1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@chrischdi chrischdi mentioned this pull request Aug 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabriziopandini fabriziopandini fabriziopandini left review comments

@killianmuldoon killianmuldoon killianmuldoon approved these changes

@enxebre enxebre Awaiting requested review from enxebre

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.
5 participants
@chrischdi @k8s-ci-robot @killianmuldoon @k8s-infra-cherrypick-robot @fabriziopandini